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

Change-Id: Ia95df397c9718bbcaa2c892583c7940c5b3b340e