Merge "Only start tether when not already enabled" into pi-dev
am: f62f91b0b6

Change-Id: If28a47b85fab06484298196305e862759998a72f