Refactoring action service

* Removing a duplication

Change-Id: I4630b2f08ab9950fcb15f06c2264f2582973e99a
Merge "Refactoring action service"