Merge "Fix some "leaks"" into oc-dev
am: 011e07d7fd

Change-Id: I76b3710a55de02d64865210d6272919f6264d903