Bug: 6711303 (cherry picked from commit 76aca97d26) Change-Id: I626d060bf2951c213679685dc57ee2eda7398da2
76aca97d26