Merge changes from topic 'fs_mgr_dt'
am: dbb40b64e9

Change-Id: I8e54aecb4825f4adc3fd92ceff1da76e1c4b227b