Merge changes from topic 'fsconfig2-fixups'
am: abf3dbe248

Change-Id: I0149e85d05c3fb60f8ab0e878a3a8172a1edaede