trip time/distance for mode switchers and some more re-shuffling
Authored by: agarwalamit 2015-02-11
Parent: [r32083]
Child: [r32085]