Merge change I404f895f into eclair

* changes:
  b/2078757 Validate the authority of the intent.