Merge changes Ic28c5653,Ic635f97b am: 1ea3d9411a am: 27dbc898dc
am: bb186ddfb4

Change-Id: Ieea9917b3a68e08686c74ebf39e5fed61f641a7a