Merge 3a500228c83c717e057a7d488c79c6ea23ed1434 on remote branch

Change-Id: Iddb8ac949d231724420bd86ed8f5bfe21f00c524