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

Change-Id: I6affd9ac8ea58afd1d43cc42b81318991d8b4077