Merge "Fix bad command length calculation"
am: b44c4d4cd3

Change-Id: I98cb1b59ea42d48375b6f95cc8f88b0e0e79d056