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