Merge "Copy native_handle in MetaData mode"
am: 69addc7069

Change-Id: I385eae455c3dbc19a0879a786d95dfdb9b6fe14f