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