Merge "Use delete[] for new[]" am: 4b31b49e72 am: 0cff1c21ee am: 42e3f99807
am: 78800cfbd7

Change-Id: I48b100719d86ee96b9e7968077d682910112fe0b