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

Change-Id: I6217571e072efa30542718e4e44c3eb472aaf6f7