Fix unhandled allocation failure am: acb12378f9
am: 63bab3c058

Change-Id: Ib1410910af8a2b1799ff25993923d059d742be66