am a8f3f067: am ae8aea76: Merge "Allow manual to be read from disk" into mnc-dr-dev

* commit 'a8f3f067b672a8e055e76beee300cc2b1a8bea31':
  Allow manual to be read from disk