Sync with CM

Change-Id: I869b59fdbd2e3b76ed7007eace9540ab3925ca78