Merge "fs_mgr: fix header ordering" into nyc-mr1-dev-plus-aosp am: 093f9b7aee
am: af2f5233f8

Change-Id: I77ea08c44c9b32eb379849ae5beb32db24f2fa95