Updates from CM.

Change-Id: Iba9540a66cfda6d4a47a566dc8c1460cb7229060