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