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

Change-Id: Id68a40da2e069c53b16c0d7f900eeab70a755e79