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

Change-Id: I6596fae1946bffade125a14b3bd095eda557a7a5