am 0560e4f7: am 72abc959: (-s ours) am 62a4b871: 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 '0560e4f73ad8860dc6de4f9c963a92454f236e9e':
  DO NOT MERGE Capture fields in CTS: ro.build.version.base_os ro.build.version.security_patch