am f998c4a2: Merge change I1c0bebbc into eclair

Merge commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806' into eclair-plus-aosp

* commit 'f998c4a289b3ed10bafcf581618d2cc8a8f69806':
  fix [2262591] Junk on screen in ERD46