PPR1.180227.001_AOSP_Merge

Change-Id: I1cfe5da1303305a94958b3e860ef64c50dd66f00