Merge "Fix bad command length calculation" am: b44c4d4cd3
am: 97a0f117e1

Change-Id: I3cb2500f792c76004351b99a94cae3aa0051cb4e