Follow-up to I4070b3b16c8b2b76a0e7a67599efd914cbde63aa. Bug: T321437 Change-Id: I4917c208251b4bcf1d31b07e717266970cb1516d