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

Change-Id: I1771bc30582c8c2fca5a1c55e60e4b6f53363af7