Merge proposals dependent on lp://staging/~ken-vandine/unity-webapps-googleplusgames/lp1369208

1. lp1369208
2. Dependent merge proposals