Commit 4bcdddc4 code cleanup did
not address actions.

Fixed.

Change-Id: Ic5de38e4d56022e3f72e5dcb08f6a4253e3306ee
Closes-bug: #1726275