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

Change-Id: Ie53c392997bb830c62bcfeef4a40c67be986d3fd