Merge changes from topic 'fsconfig-2' am: b0aa8b2369 am: 1e62d3e0b8 am: 273ff8c303
am: 693ff6a763

Change-Id: I0d304316e2edeb92ca06bac26623713b47867353