Merge a05f7fb50a60d7540b1c65632d7a9b99ae919997 on remote branch

Change-Id: I54eab217dc55ffe8e6f95e1c07efed87260f13f1