am b8bf70ac: am 4c232c5b: Merge change Idd16976f into eclair

Merge commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2'

* commit 'b8bf70acee9d8f9f48b8b68f33cbaeeb21195ef2':
  Fix some metadata retriever issues: