Bug: 32943424 Test: pass Change-Id: I1fc84c8f7b634bd3a6cfeb6c38c76842f90ac656
BUG: 31982882 Test: manually built it Change-Id: I3dd1d681061d16059ec9cf67869f20759fb75cd0