Merge "Adding privacy tags to graphicsstats proto." into pi-dev