Merge "Revert "Revert "Make system property reads wait-free"""
am: afe44cc483

Change-Id: I8ef30dc382edb27a4dc91a5215e94da2a7e6a654