Merge "Set the update locations to default in CacheLocation's constructor" am: 0acbdac82b am: 7120c687a5
am: 60b49e4de3

Change-Id: Ia1e6a93869186968db631c0f5b9c6df3c9cd5ddd