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

Change-Id: Iaca5507df3af6d670d1ceaa1f60d096f74540f1a