Manual merge from kitkat version of AOSP
From stock of u10z.