Merge changes I40f055df,I562713df
am: 4a04c07df4

Change-Id: Ie951518a0a472691d1cd8b90a025e3a67b1acd53