Merge branch 'stable-3.3' into master

* branch 'stable-3.3':
  Adjust to broken ProjectCache API

Bug: Issue 15477
Change-Id: I3581d2d57adf2ad7ddf9a3ccda5801687588ecd5