Merge "Do not set eTraversalNeeded w/out wake up" into rvc-dev