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