Bug: 38233550 Test: Build Change-Id: I7c2105d5f215a60a611110640afff25fc3403559
Bug: 35628284 Change-Id: I08877ac117212325b1259f7d90a4c0cb1dac2d9f Fix: 38233550 Test: Build and boot Merged-In: I4cdacb601e0eea1f5f0e721c568c7ee04298704f