Merge commit '24e0859a94c9ffd3bc1ec84e1f18e2d505eb2722' into HEAD

Change-Id: I8c974b487bb02d75a33df4a69d6d5c948ba0bef2