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

Change-Id: I4da9fc02a777aab48fc59e98d1509391eded7347