CM --> AOSP

Change-Id: Ia9866958bcd4b0fa35b04cfec7b82fc586d5c663
CM --> AOSP 2

Change-Id: Icd7f2febee4c3211b560d898347f9ff9bd72a2d1