Merge "Address API Council comments for ProtoOutputStream" into rvc-dev am: e5f64000 am: 1bf2bbba am: cea5db0c Change-Id: I414d1c73b425c836fade16b1742ca4d37d12f71e