Merge "Fix driving state for manual transmission." into pi-dev am: 894ae00f8f
am: 749d9399ec

Change-Id: I28f80199ef82b7bd64a715fd77294426fdede4ed