Merge changes Ic2af40b8,I9c8cfebe am: ffacb60f56

Change-Id: I239af47affe95ebbf3f019e579cbe050e1d5766d