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

Change-Id: I4ee69a940fab624a13a2066a1d03c81c4edfc637