Merge "add base::WaitForPropertyCreation"
am: 22a64b3a8a

Change-Id: I19719bf134fbd23a5473ecdeecc049c78a727028