Merge pull request #76 from laurentlb:master

PiperOrigin-RevId: 323574787
Change-Id: I8ede4b3db044e2e0e6e351559783f04487907503