Merge "Reduce the usage of goto statements in dispatcher" into rvc-dev am: 418a9e4235

Change-Id: I673bb8cd2977f82819d7de5413e88e2a598b78f6