PPR1.180130.002_AOSP_Merge

Change-Id: Ib5460405419a6517dea40bac2e22a4ffe6f0c360