Merge "replace sleep wait into property wait" am: ad37e2b37b
am: a729fdae54

Change-Id: I0e7ea56aa80d798e90724346225eb26cb7fceefb