Merge "Fix NULL deref on exec-in with insufficient arguments"
am: 245e4dbfd4

* commit '245e4dbfd459f63bad100b09bd58e3931924e16f':
  Fix NULL deref on exec-in with insufficient arguments

Change-Id: I386257b6c30c4f02e161e2b0a827e73eca9d229e