Merge "Updated intent action name to comply with CTS." into oc-dev
am: b4f21f0482

Change-Id: Ica8d3565560993dc100ccfb20adf8028f807d44f