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

Change-Id: Iaece3c515b295a275dc35690321cf2fc47e26861