DO NOT MERGE Capture fields in CTS:

ro.build.version.base_os ro.build.version.security_patch

Change-Id: Id8b29792c1d006cb87a73c2d723f6d23adef8d7a