Merge commit '2ac45032f0f91e047f5b02f0ab1aaf7bb36bd9d0' into HEAD

Change-Id: If9483371817ac6a4e28562417eaa1de634edef02