Merge "collect fs stat for ext4" am: 5811a434fc am: f3fcb883b2
am: 820d28b3e2

Change-Id: I90f95321b133305a16e3abe0fc3885992e99d890