Merge commit '5c18a675' into manualmerge

Change-Id: I6f39812ebc476351a103475e6844be1c20032939