Merged from https://widevine-internal-review.googlesource.com/148554 This change was merged to master but missed in tm-dev when we stopped the auto merging to tm-dev. Manually cherry picked it. Test: ran OPK unit tests Bug: 230820162 Bug: 180530495 Change-Id: Ib23f07f84096650beb4dd1950105db01e004d484