Merge changes Ibfe10b43,I984d1ea9 am: d94c24222b
am: db0be7e700

Change-Id: I1769264b61ec436f02ef1546db018a907447dfa3