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

Change-Id: Icb4864f14924216ada5db3fe4a375aad2bec5cd2