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

Change-Id: Iee47bdd51304f04a359ed69d0ad166868e491c89