Merge branch 'q' of github.com:BlissRoms/platform_frameworks_base into pixel

Change-Id: Iefab3aaddc8d4281f1407d81d3332ee18a04d1a5