Merge "Cleaning up frameworks protos." into pi-dev