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