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

Change-Id: I49ab55641913ddb23217d539fe5edcfd81507be1