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