Merge 6cf3b1ffc77d7431faec1186af0fab3c342b6352 on remote branch

Change-Id: Id2b9a0bdbfea9af38e6649af7aee079465b0c89a