am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclair

Merge commit 'ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp

* commit 'ebcb7c3167e76c19d4721dbc472772744918e868':
  Set metadata retriever thread group to the caller's group.