More fixings for the toro RIL bug.

Change-Id: Ia0eb43836ad38477f43b85dcdc777ef1491e31cd