Track some needed FS types from CM

Change-Id: I771d813998e50a42b3e628976c6038e64c1050dc