more work would be necessary to avoid leaks in all failure cases Change-Id: I9c92ae1c34e120b17109bc832b6b2789b909761d