PPR1.180227.001_AOSP_Merge

Change-Id: I18a9e2212b8d88bc2e77b8f3283a224d084ef0c4