Merge "Sync QPR1 branch with AOSP"
am: d1630a2808

Change-Id: I5e7900a2e55b5659ae78f6d15b20694acc17cf88