am b035585c: am b0309151: am 97ac7946: am fc0ffd49: am e85b1c69: (-s ours) Merge "DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch" into jb-dev

* commit 'b035585cbe8f049681cc94cdf71184eb0cfbee68':
  DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch