Merge "init: print property/value for wait_for_property" am: 54f7e57bac am: 6a74ce960f
am: 691b7c9c93

Change-Id: I88c2cc323e968c98fb823ed0ed5b5cd261894e60