Merge 80d0ec6167e1e0d72d9537d9b5ba3c44277d35eb on remote branch

Change-Id: I7b517e2a421224bf1d21531b9c1ce7f60bbbd870