Merge "Fix a bunch of repeated reads of a ro.* property" am: 4265991701 am: e4c2e8f303 am: 3c2837e77e
am: 6e4f930457  -s ours

Change-Id: I39dd552e6d3e6d8abed6124078ec0a9db571eac3