Fixes: 130740123 Test: Builds Change-Id: I5f64e22ca8123c6f2825d4341d94581a301551f7
Bug: 111548033 Test: manual Change-Id: I6638d471f5c6de76934b90d131a221813a38d2b3