Merge "DO NOT MERGE Capture fields in CTS:" into kitkat-cts-dev