am ace15f45: (-s ours) am 40473a53: Add safety check when binding to carrier app.

* commit 'ace15f45a029108d724c66cf07f14fbc1d7baf43':