Merge changes from topic "protobuf-3.9.1" am: 2e928fb62a
am: 89ee99a00d

Change-Id: Ibbd3573012345c37a8f52b9826337c094e18aa8b