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

Change-Id: Ic388f1ca1b3c2e65b88f60eefa87a7c6f63fcf86