Merge "Fixed the roboletric test failed"