Merge "Replace Thread.sleep() with TestLooper.moveTimeForward()"