Just a more variances from production to local dev. Change-Id: I24611c3dd4e816ac78c77930e6fd85ecafe82d56