Merged from https://widevine-internal-review.googlesource.com/181950 Merged from https://widevine-internal-review.googlesource.com/182050 Change-Id: I87f1401a02c6e475b7c728c625fbe5fc7c71dea6
Merged from https://widevine-internal-review.googlesource.com/181950 Merged from https://widevine-internal-review.googlesource.com/182050 Change-Id: I87f1401a02c6e475b7c728c625fbe5fc7c71dea6