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

Change-Id: I64c687c900766f5729eb6f593e7a1758c7076d1c