Merge "Do not cache rkp_only property"