Merge changes from topic "fsmgr_system_other"
am: 3c1cdaf54d

Change-Id: I734dd04b6627486af0ea000a95e41d6ef951f921