am 45bf152f: Merge "add more cases to AlmostFull case" into jb-mr1-dev

* commit '45bf152fb3e01bb9f134c6b14e8f972efa0e6a2c':
  add more cases to AlmostFull case