Merge 3a3ce03244420cba3b2e013db1be08946ce39ee6 on remote branch

Change-Id: Ife2ed8fc11d5ed7e07a15f9e2e71c9a53092e8a3