Merge changes from topic "fsmgr_system_other" am: 3c1cdaf54d am: b48372c5d0
am: 27c3a427f7

Change-Id: I80307f6dac7faa800b080db1a6eb9dc0149afbd8