Add On-The-Go Toggle [2/2]

Change-Id: Ia77e806e3b7fc4ab9956b3ffe890c830030788a0