b8bf70acee
Merge commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068' into eclair-plus-aosp * commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068': Fix some metadata retriever issues: