Merge commit '7e569525970ce7585595508e435e4e9ced69c631' into HEAD
Change-Id: Ie40c09761ed186d58fa0c161473a1f98c98f4f35