Merge "Changes made to accomodate GSA in Google3 w/ Robolectric" into ub-now-master