Bug 8460775 (cherry picked from commit 7323765b) Change-Id: I6710503799a6df2de142a827513d5b4c107b6ec9