Merge "fs_mgr: fix header ordering" into nyc-mr1-dev-plus-aosp