Merge e9019b8fc10a2cec4e66065890b6e3394b758222 on remote branch

Change-Id: If96baa5789a313efb47a16c36a3cd63692b5e321