PPR1.180227.001_AOSP_Merge

Change-Id: I5425e631ab8db826d20b91413776220b616eafcc