am 138836ad: Merge "docs: add info about manifest attributes that should not change" into honeycomb-mr2

* commit '138836adc7e28e66984fdc20d22688d4da561c15':
  docs: add info about manifest attributes that should not change