Merge 8eaf52d7f00ce80a35524f68b0339ce9a8ed55c2 on remote branch

Change-Id: I427aea4feeec23e8de73d71704a82bc384d5f55d