Merge "Use delete[] for new[]" am: 4b31b49e72
am: 0cff1c21ee

Change-Id: Ib27af4b3c729304f8ce6035b6a28376f794a62af