Merge "Log when malloc functions fail." am: 6b65e07809
am: 26dfe7865b

Change-Id: I0a23fd6ed8925f1be710f097a72642199692e5bf