Merge changes from topic 'fsconfig-2' am: b0aa8b2369
am: 1e62d3e0b8

Change-Id: Ibd32587a7a9a4378b6549cb3e7bfeb4024943235