Merge cm upstream

Change-Id: I5d1068c65506fb95b521e758ac45ce64e38c440c