Merge "DO NOT MERGE: Fixed breakage" into kitkat-cts-dev