Merge "Fix gson usage with R8 full mode" into tm-qpr-dev