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

Change-Id: I61f0266d3b98c39448339feada5f4e4f7e94fa61