DO NOT MERGE Fix wrong nAllocLen am: eb71a633 -s ours am: b81d978b am: cb827ed0 am: 3b5ef558 -s ours am: e5a28e41 Change-Id: I85d8839503404a9778a196756777ca5d4f7c26b6