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

Change-Id: If119f71509b9e11668d526ce965880271d004487