Merge "Merge commit '931df15b06fdb32d1416e5780b2059e3f98ee531' into cros_sdk"