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

Change-Id: Idc73b130f610fa6dec007fa74f63ded3179e5cc9