Merge "[automerger skipped] Merge "Fix proto invalid write type" am: a036ac4569 am: 18fe57024e am: 04eb319ab6 -s ours am: b793c4cc46 -s ours"