[Commits] cfd2646: Fixed the results after the merge of 10.4 into bb-10.4-mdev16188.