Merge branch 'stable-3.5' * stable-3.5: RateLimiterProcessing: Adapt to older gson version This commit is reverted. Change-Id: I097e87d882789d7ca815539b0169a29b8773cde5