Merge pull request #16 from fweikert:patch-2

PiperOrigin-RevId: 271969643
Change-Id: Ibb1cc707f170be7310ab1c661e40373d85b17754