Merge "Handle variable class loader context for system server" into rvc-dev