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

Change-Id: Ibcc650288dbb1e55858147e3b30f7e924a2838e4