Merge "Wait for data without sysprop listeners."
am: 59647ff8a9

Change-Id: I270439d99906bf6291665f53f3d2568a5a18a6c6