Merge 102cc6af4dc9353d880ee8b294c4d8b1f90fa7bf on remote branch

Change-Id: I6a7ae680b48c65923d10b95dc6d4a168eb5484a5