Merge 84a69e83ed62fec56e45920fd1a3727b10ee7096 on remote branch

Change-Id: I0316aba7940ab2a4d9175bbd22767c744759a02d