am fb5869e9: Merge "Add a class to encapsulate getting the metadata URI"

* commit 'fb5869e9ff378d6834d0eaf970543a2f417c4103':
  Add a class to encapsulate getting the metadata URI