Merge "Skip the cache size check on host"
am: 31bcd7c002

Change-Id: If265166022cc36142e4cc6061f1165e9814e9482