Fix toroplus kernel bottleservice special-case.

Change-Id: Ia2676a4ea7f0ac656dee1123d909ad65fcc71ff3