Merge "Proper fix for the LRU IndexOutOfBoundsException" into qt-qpr1-dev
am: afeaaa3c34

Change-Id: I8995547b4c58d86b676de81fd8818de199a005e2