Merge changes from topic "protobuf3.5.2"
am: 1d899f6be8

Change-Id: Ia235da2303ae0622bc8826fe9ac035fae894aec1