Merge "Update AppComponentFactory.instantiateClassLoader docs" am: 352021b4aa
am: 469fb50385

Change-Id: Ice6805ac3e84176f4de1a16972de693c043149bd