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

Change-Id: I2f3c4809bfc925987cf890bcc58d1485d46f5ccc