Amend: Fix class name resolution, no arguments to metadata adapter constructors Change-Id: I2c08563499a34996502d22f0f9685602b8897139 Former-commit-id: fc6effe4993694944d5331038d24310dec44a5d8