Merged PR "Remove two warnings" although there was a failing test. But @rinkk and I did not see a relation between the failing test and the changes done from @wenqing.
