This can be merged before the code is dropped from VE, as it will just overwrite the registry entry. Bug: T141676 Depends-On: I2c35b9443208928db43bcfd515864641b10cc602 Change-Id: I2fa7ca7203e0a82f5ce9b79e2642dba2baba6c5a