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

Change-Id: Ie379dc6782f77e051d7d3eb56ad8661bb3c33ee7