Merge 6525bd0037fa6248bf4d60c157651f322efea758 on remote branch

Change-Id: Id8a196bb1e91893b2f48deddc9af9324591fe3fd