Merge "fs_config: include both oem ranges"
am: 27e0d48

* commit '27e0d48f0be2242655d005d0d37c705d4a8ccf33':
  fs_config: include both oem ranges

Change-Id: I3a5c12539e58810e09e2f41277f95c191e1daeaf