Merge "Moved implicit intents into explicit intents" am: ccda81e58f
am: b7db5ac6d8  -s ours

Change-Id: I13a65c3d132c465b43baa64d195ce9f03f96e167