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

* commit '1234ba4a6f7061ea763014d120b11c48c8941816':
  Add safety check when binding to carrier app.