Merge "Initialize mMetaData correctly, fix ref count" am: 7ef724dc97
am: f35235922c

Change-Id: Iff31d7078332d4f7501ef4eed2fa0617935ea1c9