Resolve build breakage for merge of fix to b/11559103

Change-Id: Ib42eb48a234f53d34d23f5c661331b2f37be4209
1 file changed