Merge "Cache flush/invalidate needs RWX permission"