Merge 40cfed4632a2df3aaba11d9af65449cf44c392ea on remote branch

Change-Id: I8549d0f25a45710a140360e3854c2705271616f7