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

Change-Id: Ia464313ada5d7631639e9e86c85b0c2f688cde29