Bug: 64801878 Change-Id: I1c018422110ee74183a82923af9d78b88016638f (cherry picked from commit 502015b2)