Bug: 19483574 (cherry picked from commit 7d66f783) Change-Id: If617e29b6fd36c88c157941bc9e11cf41329da48