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

Change-Id: Icc494722c9403ee8a88549b92561a5df79868b0c