Flip Action port from CM

Change-Id: Ib157383d6a90e8f0b508a980e2c1e114811b8912