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

Change-Id: I6c9c4461513b460e5387e2593a43370a82bd0f9c