Bug: 64018485 (cherry-picked from commit f939b3f7) Test: 662 Change-Id: I93b1f4a825d33a2e3f0d92c7fa97358b1e7bd961