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

Change-Id: If6ca1870e629d2cc3600c697c7c997c695a84e6c