Merge "Use FLAG_IMMUTABLE for ServiceStateTracker" into rvc-dev