Fixes #566 PiperOrigin-RevId: 500750288 Change-Id: I00f94ee37bb2f15be59df3933d0d4dba583f0921
PiperOrigin-RevId: 489980760 Change-Id: I1c21e736a86f6637a00e2062727d2e6fd5694c42