Fix memory leak due to smart pointer misuse. bug 11965932 Change-Id: I982b974b3554b0f4dc7a558107703ff605f580e6