This was missed when initially implementing the support CCBUG: 431995 (cherry picked from commit 458d973e)