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

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