Merge "[Cherry-pick] Simplify platformprotos"