Merge "Add sleep in unsafe path."
am: c10ecd6086

Change-Id: Ie81b409fbd98389198801c75230c71a40303f34a