Merge commit 'b7db70f9d1b0614ba939eb9687d69ff0903428b2' into ks-aosp.lnx.3.0.r11-rel