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

* commit '24cb6374df50a6ea5978fb9851e4030ac9924307':
  Allow manual to be read from disk