Bug: 131861430 Test: Builds Change-Id: I7e831f74f1e55026b9343a4c4f47c9f5adc316e6
Test: Builds Bug: 131774352 Fixes: 131857742 Change-Id: Ib384b9efaf053b405ce3f55e449dd6abb9e75296