Merge "Set flags on the correct Intent, please" into oc-mr1-dev am: 33894b2998
am: a80316daa3

Change-Id: I486096da329ccfed44ba6e5e9f6e14af47db8932