Merge "Ensure the generation is not changed before put value to cache" am: 11ae580f81
am: 489f2c2c48

Change-Id: Idab1a2d1f4ee8cc28a38c3c82ea9a8ad7f9d3bf4