merge of https://widevine-internal-review.googlesource.com/11255 from the widevine cdm repo. bug: 17657356 Change-Id: Ia228395c412c8d00ef0230f86f4b56469a1e6c69
merge of https://widevine-internal-review.googlesource.com/11255 from the widevine cdm repo. bug: 17657356 Change-Id: Ia228395c412c8d00ef0230f86f4b56469a1e6c69