Merge commit '1fba8ffeb09ad264b569d1210b1220bb992e526c' into ks-aosp.lnx.3.0.r4-rel