PPR1.180227.001_AOSP_Merge

Change-Id: I702edcb5782cb73550cbd87b711ed46f5dd2443e