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

Change-Id: I953c2bb97dda4ca654e552d58bf56d884d609fc0