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

Change-Id: I2303237cc57446624b265f8fedad285105292a64