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

Change-Id: I6bf3f1c59f79f222b12ace8b9dcb4eed68940cb9