Merge changes from topic "bug169389392" into pie-cts-dev

* changes:
  BitmapTest: Fix initial memory measurement
  Try to de-flake & improve the not-leaking tests