Merge commit '3e40e8fb73926775ccf82025cfe2dd1dc709a610' into HEAD

Change-Id: I6476d826ab91f8f0d0e0d014c7c9d19f4b673264