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

Change-Id: I2647ec07cc2a311427c3461bc3a4b4948886cc9e