Merge "Fix bad instruction massaging" am: e5a2644cd8
am: 5661e735ab

Change-Id: If9314841492fdef05a181b6360d545474eab09d8