Merge "Not using resource ids for EXTRA_INITIAL_INTENTS inside a managed profile." into lmp-mr1-dev