am 4c3916b4: am 41f27292: Merge "Move the catalog after the stack maps."

* commit '4c3916b41167431978f9104c4a94589cdced8c60':
  Move the catalog after the stack maps.