Fix-forward for breakage introduced in b/29732496.

Fix: 373281882
Flag: EXEMPT fix-forward
Test: manual
Change-Id: I2ce1ecd1617be3c3c8208222267a50ea39de80b1
2 files changed