Merge 5819eeacbb24e82b1c0274ade044ba19110b4e0a on remote branch

Change-Id: I6788920d204af57f4216016ea7c6bb85bf053855