Merge "Add a no-op activity to handle development setting intent." into oc-dev
am: 0036ef2cf0

Change-Id: I116509d6ee62fd0633729f832cf88e4e9d9c6708