Merge "Fix dangling SingleImplementations left after class unloading" into pi-dev am: e54c8ce8 -s ours am: c49b2cc1 Change-Id: I81a62c3ca520f06e72e90077207905e890ebcc75