Merge "Extra logging for metadata errors" am: 1b727bce06 am: d365a4f57c

Change-Id: I407c3dc23b2c9d564faab810c3d37d7fa20673d4