Merge c646c98aa3b2ebaf3eb857da612372d9ade144da on remote branch

Change-Id: Ibd06f3a5356f0dbd11056c973b5ab54302b10fa6