Merge "Rename contexts of ffs props" am: 8880f7700a

Change-Id: I5d74b88ccb0b5d8b850955cfc701b6ff36934559