Merge "storagemenager: Skip fstrim while doing block based checkpoint" into qt-dev
am: 274b17c925

Change-Id: I16046484e9dd39b083a43e2414c04ffb81bafcc2