Merge changes Iaf823919,I5b95b358,I24eae032 am: ed7c7e6f62 am: b13b01d529 am: ecaf388d27 am: e9e5f9cf7d am: 8051d09d03

Change-Id: I9d6c23ca67fb05893877fa34f45861b86a693e1c
(cherry picked from commit 43f429e09f76bedb62c51631df3bd5965a0d6582)
Bug: 150829891
4 files changed