am 9a65f9dd: Merge "Add an AM option to start with allocation tracking"

* commit '9a65f9ddd066c1824e2068ed114d72862689f6b0':
  Add an AM option to start with allocation tracking