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

Change-Id: I7d84460778f3087a85c643302047373d330535dc