Merge "Fix failing test_fs_config_generator.py tests"
am: f83ba4e8b1

Change-Id: I70fc52b006407fc749057b74c2599eac2e4c5392