Merge commit '50e26d2fd7a09b4f16e248b776398d11fbe2fb0a' into ks-aosp.lnx.3.0.r4-rel