On-The-Go mode [2/2]

Credit @Evisceration

Change-Id: Ia5645635ca6d6632a542019b86cbf3c3c7420048