(Broken implementation appeared in change I967e455.) Bug: 5158885 Change-Id: I0e22c269ff76d19bcdd5e51e1722e34fdc025dfa