Merge "Silently ignore illegal call to start." into pi-dev
am: f16521df40

Change-Id: Ib52b47e8795cc89a2590083b495b21faa08d7c27