Merge Google's v1.10 source release

Also updating stock branch