Merge changes Ic2e27f56,Ie19e0995 am: 95f507f80d am: 6245e7efe6
am: df99ad0cf9

Change-Id: I0aa2d7bda198ff9bd73e173eb3d54f7f748ba8dc