Merge "Temporary remove resource-display caching" into oc-dev am: 8f4bd67929
am: 8063101678

Change-Id: I1ca01d912880b629b67a25a2a03e257f35a83400