Merge proposals dependent on lp://qastaging/~oly/webapps-applications/googleplus-indicator-counter

1. googleplus-indicator-counter
2. Dependent merge proposals