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

Change-Id: I7836a8c58ebf08c8f74a9fe937642a3eae93d721