Merge "Reevaluate constraints on run command." into rvc-dev am: c3e1b7ddff am: 39b049991a

Change-Id: I8403933d4b48526d0927f595446022d0f898f7a3