Merge commit '9d42a8e478a73a12184de22d807a43e98ebb77b9' into HEAD

Change-Id: I4b4d253e2be865aeb47795ebbdd754a02054531e