Merge "Resolve build breakage for merge of fix to b/11559103"