am efd9f5c2: am 1e9c1ffa: Merge "Use image pointer size for profile info"

* commit 'efd9f5c23a37a373839ff75637ee8d5898da8639':
  Use image pointer size for profile info