Subject: Change metadata calls to reflect the changes in the client

  sent in through the headers instead of read in from an arg

Change-Id: Ia90d0abaafefd952374bbcdbcdc463690b82efd9
Merge "Subject: Change metadata calls to reflect the changes in the client"