Merge proposals dependent on lp://qastaging/~ken-vandine/unity-webapps-gmail/lp1369208

lp://qastaging/~ken-vandine/unity-webapps-gmail/lp1369208 has no merge proposals.