Adding 'tags' to actions

Change-Id: I4fb5780b991c6c653847bae50d36d39b0517d49a
Merge "Adding 'tags' to actions"