Sync with CM nightly

Change-Id: Iab08783dc0d1d8aa9c017bb22eba318c7df17351
Clean up

Change-Id: I3ad4dd3a2fa0cc0fff7c26eb95e8de17f9228180