Merge "Restrict sending new intent to one invocation." into oc-mr1-dev
am: fed715e7b5

Change-Id: I60ada8929f3439cee110f2e684b34c252d805e71