Merge e8adf1d5df0fd2819ca794a6c7a999b921591b31 on remote branch

Change-Id: Ida1502c8a829033d8d3a8286f38e42a394449c48