This change the merge from the android tree of: https://widevine-internal-review.googlesource.com/7353 bug: 10447846 Change-Id: I0a2496fc6f225e0f3b23731c24087ddc6068c9cc
This change the merge from the android tree of: https://widevine-internal-review.googlesource.com/7353 bug: 10447846 Change-Id: I0a2496fc6f225e0f3b23731c24087ddc6068c9cc