Initialize some uninitialized pointers am: 95582e766e am: 3f78b48904 am: ffe2e04b58
am: 63394301ce

Change-Id: Iacd43384b68c1bc9b05052cbe21435ba424e3faa