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

Change-Id: Idae03df4c33093beddfd74df47f0a019592b4893