Merge changes from topic "fscompression" am: 7f4a71c2ff am: 0f5df6477d

Change-Id: I3b1d5956b6c3783b14b203c1d6d234d6b97667f7