am 9abfeaca: Merge "Fix backwards Engine cache test" into ics-mr0

* commit '9abfeacace939c457393b718f146072e83304446':
  Fix backwards Engine cache test