Bug 497931 - Added a failing test and a TODO in the problematic code

Change-Id: I9562d0452a3ba08b940d948e040580e858abaa39
2 files changed