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

Change-Id: I739c9c7b1a75c24cf163f8523e656eb6791e7d44