Merge 322803b229feb2f416e89d0d7e50555639596f62 on remote branch

Change-Id: Id2bb5cc65e3b88553a9dd494b0c1821831bb9d7f