merged latest upstream patches from CM11 repo