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

Change-Id: I0350e2e949d51337bbed76b41dc87a623be6152c