Merge ad6c62d0854f8eb6f530909d11fc7ff6edbf7dd3 on remote branch

Change-Id: I0ef4a3972a9af801e565368f49e19e17498bb879