Merge "OMADM intent sent by both system and apps." into nyc-dev