Merge commit '3354ec9390f7339e6b87d011e27de74ec55468a6' into ks-aosp.lnx.3.0.r4-rel