Merge 5e714211c4ff3da371898bf6bbd341ab844d2cb8 on remote branch

Change-Id: Icfc971ea1429c79cdd21709d3ab1dce3cd2ceea6