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

Change-Id: I50b008c276db892e32560358acd36c5d044ff971