Merge 96f593c0bbf306bb6fc1729a889bd332adbdd8b8 on remote branch

Change-Id: Idca6636231f68984681771ef06d327a4cb5cad9a