am f25c46cf: am 7775d2c1: Merge "Fix for issue 20051601 - ARM instruction alignment."

* commit 'f25c46cf586bbfcd9ed69e22958b96d9ca9f65af':
  Fix for issue 20051601 - ARM instruction alignment.