Merge 12299eccb113774c12e7b3b5136835d321d52d2b on remote branch

Change-Id: I5eaa381195e3782d9be7407f7592ac4a0250cf99