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

Change-Id: I6d037c4b08a1bf0dc68c880b4cec037d97588251