Merge abe9ad4f455414cec12ca71c963128193be126e0 on remote branch

Change-Id: I005521465adca6b40617a4be23201c7dfc644432