PPR1.180227.001_AOSP_Merge

Change-Id: Ie7a1b6d0a29935f476bdd76af2724a784e4b4d23