Plural support for AndroidFFS

Bug: 45695
Change-Id: Icaf524ddd5605f40c1692857b986a39e9d82fe75
Merge "Plural support for AndroidFFS"