Merge 824f204d822c57fdf493c6d84b0217de36e24271 on remote branch

Change-Id: Ia975b56b97cfe29bac919ad0559e216a23676b3e