Merge "Removing temporary workarounds to make tests pass on Cuttlefish" into ub-launcher3-master