Merge "Add a helpful error message if GetUnreachableMemory fails" into oc-dr1-dev
am: fe11ca5421  -s ours

Change-Id: I77e4ae5e39fd880dfa0914e1628447b94ceae70e