metadata fixes

Change-Id: I1e987be8246fb5f989285bee0b0714a943c9338f
2 files changed