Merge b3aac605c100c8a8155b1e0891d9c359e94d544e on remote branch

Change-Id: Ib0f3dfb603ad29c674c29d557e1685584026c56d