Merge commit '09e2eb749f4bf71d13cdc07ee35c5c52991d87c0' into HEAD

Change-Id: I5c5945d72d09f803a97554c1fd6114e6d51f498f