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

Change-Id: Iad6fe0e4e64820fafd3bfbfb0d721293d03784cf