Bug: 17622827 (cherry picked from commit aa93129c) Change-Id: I5467d488b4a57f7be35c72c16775df5bd5d69a52