Merge "Mention <intent> can't have string resources." into oc-dev am: 6c3e92bbe9
am: d76076a103

Change-Id: I4b529623ca5169e4f56efa9d9d23d55f9307a829