am fc36afcb: am f998c4a2: Merge change I1c0bebbc into eclair

Merge commit 'fc36afcba6e65f2e0816b1af08255b9ccafb17a6' into eclair-mr2-plus-aosp

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