Merge "fs_config: Fix oem range parsing" am: ce6c8e629f
am: c16a64b832

Change-Id: Iafb13daaa210eea2c19e11eb1d9b2d94a5d047bb