Merge "Update Roboletric to 3.5.1"