fs: sync from mako lollipop + fix
mm: sync from mako lollipop + fix