Merged from https://widevine-internal-review.googlesource.com/185856 Merged from https://widevine-internal-review.googlesource.com/185910 Change-Id: I51d7a0fed2475333f459030005e796c2055fecc7
Merged from https://widevine-internal-review.googlesource.com/185856 Merged from https://widevine-internal-review.googlesource.com/185910 Change-Id: I51d7a0fed2475333f459030005e796c2055fecc7