am 40473a53: Add safety check when binding to carrier app.

* commit '40473a538d0b51b5d4e83421e06c99cbe05c2468':
  Add safety check when binding to carrier app.