Merge 6af0009ed98dc8bf6de73401cb1a190223202cf2 on remote branch

Change-Id: Ia4986bfdf3ef21c8f547afe588e64718dc60c8f7