Merge "Rename CacheLocation to Paths." am: 49c7f1cec3 am: ce562bacfd
am: 7acf21c34a

Change-Id: Ifb9a8a76d7c4165ade02c308299b3786d36f345a