PPR1.180130.002_AOSP_Merge

Change-Id: I744f3d5a7f646eefa1071e53470b84e2fb9e1973