Note: this is a re-submit of Ie5111d9c435b64d205b140a79863c0273742ee7f, fixed to avoid breaking the Mac build. Change-Id: Ib534063d3f403d33d162956bf510baf9689a246a
Note: this is a re-submit of Ie5111d9c435b64d205b140a79863c0273742ee7f, fixed to avoid breaking the Mac build. Change-Id: Ib534063d3f403d33d162956bf510baf9689a246a