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

Change-Id: Iecc67c50bb772624803149681bb89e8a6e672b7f