Bug: 10112253 (cherry picked from commit fb2f70c7) Change-Id: I149c30242f3c9ef1f67b95e26731c2505e840171