Merge "Implement long sleep for VVM task scheduler" into nyc-mr1-dev am: 5b09d4c4e0
am: 6a6db781f8

Change-Id: I7e0cfe2ab739feed15ee90c1593acdf31ac102d2