Merge "Revert "Reverted the sleep scenario to before using test options."" into qt-dev am: b5a84b81 am: b6e6330b Change-Id: I5cea3086bf9319281ecf794e68ee407ebc8ce4a5