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

Change-Id: I20300ec3dfc4009c9a022b9fb742d6f0d1057db5