[automerger skipped] Merge "Reduce the usage of goto statements in dispatcher"...
[automerger skipped] Merge "Reduce the usage of goto statements in dispatcher" into rvc-dev am: 418a9e42 am: f166d446 -s ours
am skip reason: Change-Id I0ef0b3a0820ce643486cec5d9cbeb0f593344ee6 with SHA-1 7f0a439e is in history
Change-Id: Ib9b1810f9a1a35ef9cda7abc5100e38fbbf6a752