Fix memory leak in error case Bug: 37239013 Change-Id: Ic33e0f7ed946d0729efa46f69aff1a5d35e81b1e (cherry picked from commit ab34612a31e82b713ca0ac043e14f68f3788fbda)