Bug: 18486731 (cherry picked from commit bb404aa9) Change-Id: I048f6064cc49c78df21a1c42316761502a0a5366