Merge "Cleaning up notification proto." into pi-dev
am: c1812aa644

Change-Id: I3d42d18bd9b6a2cea20a084083c327ee6372fbaa