Merged from https://widevine-internal-review.googlesource.com/177111 Merged from https://widevine-internal-review.googlesource.com/177117 Change-Id: Iea28155a369f71557a32cc34da7bd328f78e2413
Merged from https://widevine-internal-review.googlesource.com/177111 Merged from https://widevine-internal-review.googlesource.com/177117 Change-Id: Iea28155a369f71557a32cc34da7bd328f78e2413