Merge "Cleaning up notification proto." into pi-dev