PPR1.180227.001_AOSP_Merge

Change-Id: I495fb3c1c6f808e6438103e5cf0b4ed4bfad5bf1