Flip Action from CM

Change-Id: I2caf423ecefd2630547611cc9688c7de01f3d44b