Merge "Reevaluate constraints on run command." into rvc-dev am: c3e1b7ddff am: 29c95f6e52 am: 8c46c222f5 am: e182519623

Change-Id: I7c07fadda9c18803b174eeaca49a0f358162c48e