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

Change-Id: Iea2b8f24189b805a846044cd14d978e0a50f8e90