am 21d8bd12: Merge "Adding more tests around System properties"

* commit '21d8bd1227a8b877adeca3062dc5a427753156e2':
  Adding more tests around System properties