Bug: 38232801 Test: Build Change-Id: Iccc16430e7502bb317f95bb2a5e2f021d8239a00
Bug: 34766843 Change-Id: I5be615d818ecf999fec6514ce9b89ff6a7f13cd6 Fix: 38232801 Test: Build and boot Merged-In: Ice78aedfdbe82477a84252499a76dad37887fe6b