Merge "Move some properties users to __system_property_read_callback()" am: 4a5a337ef2 am: 604f61dcbd am: 6597b95707
am: 33c3c190f7

Change-Id: I40a1f94388407d4c79437f44b64006609830fa9d