Merge "Correct registerNativeAllocation type" am: fe015a098c am: 90e8135f1e
am: ecb7e4a77b

Change-Id: I2ba5370ad1f6f3b8f0ad757c0993b5c399baaea7