Merge "Cleaning up frameworks protos." into pi-dev am: 4738c7d0ab
am: 65b24cf8e9

Change-Id: Ic52f94609f10b97e3d6adf830ab2fc90616fe35b