Bug: 30114799 Change-Id: I9b8d67d09e4627f22a9fc58421dd52aa3650c235 (cherry picked from commit 97a3d3c3)