Merge 8f44621b0a7dc818c67d370eb34decfeda2cb5ac on remote branch

Change-Id: Ia0e377dc77951644a1f591295109ba880b626d41