Merge "effects: fix a theoretical memory leak"
am: 7f4beda2de

Change-Id: I27d87188283c0e31cb607f3de15f9f1170cb94fb