Merge "Change name of the intent fields" into oc-dev am: 5379b05256
am: 368628cd8e

Change-Id: I0861afea841e3e5b4b2bf94d522e6ddc2eca2cc4