Merge "Handle empty strings in GetPartitionAbsolutePath." am: fcb8b96145
am: ffa89de405

Change-Id: I47910424b60844101ef82fd132707c1161ba2ead