Follow-up to commit 625e0007 and commit fac8cb2405999d18aefd75387a5bbdb0c6160e7f. Bug: 64689630 Test: m Change-Id: I119cf83a5a54c15973ed3701ee448a9590bb404d