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

Change-Id: Ib6763ccc6a0b02949c6a0e004c18502cac7ea46f