Merge "Remove CACHED_PROC_STATES which is unused." into tm-qpr-dev