bcc331382880c35830d3598fbe391a7497f8cae9
bug: 163163467
test: ./build_all_unit_tests.sh
./build_and_run_all_unit_tests.sh
Merge from: go/wvgerrit/116524
Change-Id: I5eaf5ed34b46445d23530ca0edca94bfaeb3abaf
Description
No description provided