am 802aaf3b: am 47de3060: Merge "Fix element size on 64b"

* commit '802aaf3b9d029e8f6fdb1bf0a81758484801d330':
  Fix element size on 64b