Make sure no invalid (undo) helpful/unhelpful flags can be performed

Change-Id: I21edebbe0e292fefa1db850caea3b260d7de1499
Merge "Make sure no invalid (undo) helpful/unhelpful flags can be performed"