Merge commit 'c980a4a3c1d7158ccaa6c53adf6dde0500fd6257' into HEAD

Change-Id: Id89ab2f22dc00a878598caf3ed4ca1bf09b8d991