Merge "Align with metadata API changes"
am: c475caffd6

Change-Id: Idb30098756a611d5e24b90dac24059e4010c16a9