internal change

Bug: 62423454
Test: manual and updated unit test
PiperOrigin-RevId: 173731907
Change-Id: Ic73600197b1c4fa6ac0937a8c38b048cd8faded8
13 files changed