Test assumes a path must exist. Bug: 28901232 Bug: 28950284 This reverts commit 35121769. Change-Id: I2b6788bfd26801d5ecc5fdaf06c23f36e9f393a0