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

Change-Id: I74940187c6aa296af360a93718015d6aaf3bce38