Sync with CM

Change-Id: I33d1f6501a48e9370ccfd07b35f70a9a1f5a9e4f