Bug: 335398236 Merged from https://widevine-internal-review.googlesource.com/197432 (cherry picked from commit a35129440254c91a261903e499e3f2417425cfb0) (cherry picked from commit 87d58f48d62dbc4cdbb6c2af1c5a7bda2e209efa) Change-Id: I7f67dfbc8725cbe0a67d8eda082fa184286d2e84