Merge "Set the correct size of the cache partition Manta." into jb-mr1-dev