Merge "fs_mgr: overlayfs: empty system partitions excluded."