Merge "health filesystem: update garbageCollect() function." am: e1ca153525
am: bb51a7cfe9

Change-Id: Icea82dec3cc5d292a2488f79d3dc5e72dae62fdf