Merge "Use Class.forName instead of ClassLoader.loadClass."
am: dc489aba0e

Change-Id: I80f1488c7cca5ce68555786a7951f30172c905f2