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

Change-Id: Ic6f46d15568f4a87bcc1f06b523bc6a22ec647e6