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

Change-Id: I0d1370f9dbb11e605a511286f669cd2e0eb8b47b