Merged from https://widevine-internal-review.googlesource.com/174772 Merged from https://widevine-internal-review.googlesource.com/176633 Merged from https://widevine-internal-review.googlesource.com/176634 Merged from https://widevine-internal-review.googlesource.com/176670 Change-Id: I36438c102bfe68ff16eab3db301377e858f533c1