Merge "Simplify handling of finalizable in LSE."
am: 3b3ecdf4fd

Change-Id: Ia1e3cbae535b46ed3a1f094e6d75a96beb06e6ae