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

Change-Id: I26ead23b26bd5ed50804cb5edf0ca15d10303eb5