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

Change-Id: I7fb668ba666a39beb6e6a12f79dc5d8bb4f38f47