Merge "Wait for data without sysprop listeners." am: 59647ff8a9 am: 5acfb793a5
am: 7515f02d2e

Change-Id: Ic494f437e851df6f249fbd37e39089c6b5c14af1