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

Change-Id: Id35b59423b7e5b6515c8355d643563721773b55f