applied latest upstream patches from vaniraosp repo