Merge 8bab5ed721bcfb84f899f3a4348fd2cdac708450 on remote branch

Change-Id: Ic94fe7d446a7a1f696c95c0c02a2f73bab31420d