Merge "Allow size for malloc-only registration" am: 44fea11dc8 am: f921c7d022
am: 47e45694b0

Change-Id: Ibe84ca75426deb7aa85907fb61c3f11ced5c0ad1