Merge "Remove special case handling of "ro." properties"
am: 560fde999a

* commit '560fde999ad87379e8adfbe36958a33db4eb1c81':
  Remove special case handling of "ro." properties