PPR1.180227.001_AOSP_Merge

Change-Id: I8db050d250898d2732eeabd4f2478c560536f588