Follow-up to commit a2fed081. Bug: 123888325 Test: N/A Change-Id: I1ad8bbe946e84c49bbf9ba3be606d213313b273c