Merge e73dacca723a488234d4bb6c3b50a7fbbd9d6d9a on remote branch

Change-Id: I6e4bcd6d3b9ec578dd9c741bcfb0c6d9f597e568