Merge "fs_mgr: use "-T now" for tune2fs" am: 7ef2b1d853 am: f8f993ad1f

Change-Id: Ia6d3b39afd007749de210287e7f68a3269265fd5