Merge "Prevent key removal on cache update" into qt-r1-dev
am: c1dc1facea

Change-Id: Iba19e17cbd447ba045aee948c5156a10c89049ba