am 68759278: (-s ours) am 2c86de8a: Merge "Throw correct exception for null paths" into mnc-dev

* commit '687592783ce3953b149ede374795f13a92aeea6a':