Merge "Moved implicit intents into explicit intents" into nyc-mr1-dev-plus-aosp