Merge "Use standard loading code in many tests" am: 4bb9a2b0b2 am: 4498ff2ce6
am: 057f5caf01

Change-Id: Ib98e116d9e401b4428820b9978cf74877e259379