Remove hints to fixed bug 54044

Change-Id: I119a2ec4114fd7939ef2d74e614b4a8ff8e257ac
Merge "Remove hints to fixed bug 54044"