Merge "Cherry pick "Fix strict mode violations in Android."" into lmp-dev