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

Change-Id: Ibd0e02676e3745edc0e4c1866dddb45e0db7670a