Merge "Sync QPR1 branch with AOSP" am: d1630a2808 am: d2f79d507d
am: ecefa5f89d

Change-Id: Id22e428c5081a600949a1c20cb1bd977affe9bc5