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

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