Merge "Don't print contents of user-provided bundles." into pi-dev
am: dac0fe910a

Change-Id: I2abc3adc142b7ad4c4cc25e3a382d53cecec5002