Merge "Sysui Leaks: Leak check destroyed fragments" into oc-dev
am: b160141698

Change-Id: I22c165cb1a366e967bebf369ed79eaf86da995a4