bug: 21787354 merge of http://go/wvgerrit/14663 from the widevine repo Change-Id: Ia8618c9daba2526234c5c5c84590e74d6feebf95