Merge changes Iccee9278,I04305998
am: 418a818639

Change-Id: I6d71bca44b6e7aeeefad494019d0e11b1be354bd