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

Change-Id: I27e90c362abd23746e4b854308cf14b46abe9293