Merge 3b0af7392a52b01cae68b1d6597921046d0f9604 on remote branch

Change-Id: Id0fec8f16d082a2c1407dbc4fc60a28bb7bc025a