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

Change-Id: I08d303175f3436b8b986af456b2188d424d9094b