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

Change-Id: Ib72467e53e22ac7bc4f722262f73917b335c3c6c