Merge ea861dc303e317bbc64ec8ceab3baca0e784fa47 on remote branch

Change-Id: Idc3b5a2c2b6a993e7312d469b5e236d54c9329dd