Merge "Merge commit '3d6176ad27301b189799cd2cd7d2feadaf248f13' into cros_sdk"