[automerger skipped]Merge "Use unique_ptr for proto parser to handle...
[automerger skipped]Merge "Use unique_ptr for proto parser to handle destruction." into pi-dev am: 2e971a91
am: 7104adac -s ours
Change-Id: Ie9a6e46d9ae1dc0107b08a034d846c65d4f57616