Merge "fs_mgr: Don't report 'Skip mounting partitions'" am: f17902b392
am: b00b6876d9

Change-Id: I09149e24fc5eb22b7218904a0921726c378c2ef2