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

Change-Id: I575267b0526373c94d47bf0e98b88aeb6817c00b