Merge af03f789bb1221ecccefed7245db8be120d2d6eb on remote branch

Change-Id: If784002cbd5440c053f4fbec064f54bb394a5944