Merge changes from topic 'am-453b2166356e44c1a431040ac87bd428'

* changes:
  Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp am: ad873323fc am: 01eeacdbe9  -s ours
  Moved implicit intents into explicit intents am: 6356b6e3c7 am: 005a5d609e  -s ours