Merge "Fix memory leak warning." am: ae6088e456 am: 37cd5f116d am: 4c09f57e62
am: 31dcf0154d

Change-Id: Ief95861362c2ed6146c12c2b1570024dbde49269