Bug: 14638347 (cherry picked from commit f582426e) Change-Id: Ic86c1f0affa109b80bc1e8e85ee353db1c087bbd