Merge commit '6a9f32347249e01dcb3354d18ca5bcc616926a76' into ks-aosp.lnx.3.0.r11-rel