Bug: 8291716 (cherry picked from commit 8240bed9) Change-Id: I1da2d0757ed304c352229f9818c052925d4e976a