am 6b89efab: Merge change 24168 into eclair

Merge commit '6b89efab5ac6b1d5d59891ee4746347957de5c05' into eclair-plus-aosp

* commit '6b89efab5ac6b1d5d59891ee4746347957de5c05':
  Improved DEBUG_SAVE_INPUT_TO_FILE logic.