(This is a merge of http://go/wvgerrit/11626 in the Widevine CDM repo.) Change-Id: Iad48e76a77c285c0e0738b22436dc60cb3704740