Merge changes Iccee9278,I04305998 am: 418a818639
am: d21f19da27

Change-Id: I106b6fc4cdb6368af1f0b643f29b1c8bd8cec0ce