Merge 55f74efe72becb88d6957ad8be86e027f34a31e7 on remote branch

Change-Id: I1328c438086a250d17cf5249d95ae30b89cb1fbb