Merge commit '7fe6d778159120dd1b96d2852e708ea175c72657' into HEAD

Change-Id: I9ebb0a36fd945658796c15ad8f58441bc6928a49