Merge 6b8efa3d2ceb326b12cdfca95ef2112904117887 on remote branch

Change-Id: I957c98ab39dae4fbb26c990f034cbb40bd02114a