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

Change-Id: I52b5811ab3aab9bda73d1c4706858e3e8a70bef2