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

Change-Id: I41141b6fc6934faf086ea930b19539a0daba8298