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

Change-Id: I6448d98495856146c1851078d8bc88a8897bc962