Merge changes from topic 'fsconfig2-fixups' am: abf3dbe248 am: 2fe7f7a402
am: cd43ea88e5

Change-Id: I4bfa97c683d5d04cbe5130ea25d1788a5fd9357f