Merge 2264090a105675368a8675143e888da7794e81f9 on remote branch

Change-Id: I6af9afb0e830c415e526424e76f7f651765eb876