Merge "Fix bug 3281956 - Cherry-picked from GB"