Merge "Remove the cache size from internal size." into qt-dev
am: 10f78591a7

Change-Id: Id9e87dcada22fb48218ddd2c9bfc2293fd5ece18