Merge changes from topic 'fs_mgr_dt' am: dbb40b64e9 am: ad384fc992
am: 50eb15a0d0

Change-Id: I4c8784610d0d41c3807851c516e3ef59388ca70f