Refactor/enhance dispatch table init

Bug: 27323830
Change-Id: I9da69782cccbf42761cbd82d99df2bab80e9e57c
(cherry picked from commit 5b042ca38df2185548fc2bd905d2c460a073598e)
2 files changed