Fix unhandled allocation failure am: acb12378f9 am: 63bab3c058 am: ba71809c26
am: 04f4d9bd83

Change-Id: Ic663cc60099a174000eb35c11808927c426d2a7e