Merge "Fix bad instruction massaging"
am: e5a2644cd8

Change-Id: Ifef1cb65ff99e913b3e39f883e9ffd7bddad4212