Merge 1d8fdd22477b903e1d8d7d1bb2d294b80bd19ddd on remote branch

Change-Id: I307b7db54ec8753908ef2cf083777b565042c580