[ Merge of go/wvgerrit/149989 ] Bug: 227848537 Change-Id: I9407b133654c20ddcd3c15404dd19b3719064e6e Test: Irdeto monkey test