Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'"""