Merge af03f789bb1221ecccefed7245db8be120d2d6eb on remote branch

Change-Id: Ifc72b9a10aea0f6826dec11edbb6bab07a9080c2