Change C

Change-Id: I3c33b6b0a9284c8e6f4397e313ad14062e2049dd
Merge "Change C" into kitkat