Bug: 16242766 cherry-pick from master 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26 Change-Id: I76efb3bef888eb1e94c4e5455934816fb4acc5bc
Bug: 16242766 cherry-pick from master 2e7beadedeb7d41d8c2d1cc62956bdd9f5081d26 Change-Id: I76efb3bef888eb1e94c4e5455934816fb4acc5bc