Merge changes from topic "fscompression" am: 7f4a71c2ff

Change-Id: I42086b7abde79ae1edb177f3668c73b1c7972295