Merge "Address API Council comments for ProtoOutputStream" into rvc-dev am: e5f64000 am: 1bf2bbba am: 263699d9 Change-Id: I6ee9c7b866f1ec61e117aba0d19566cca9241e05