[automerger skipped] Merge "Better protect staticly accessed resources to prevent exceptions" into rvc-dev am: 4b4ed704 -s ours
am skip reason: Change-Id Ic58dcc2bf1985c173465e245787d5567250a5577 with SHA-1 80a7cc8f is in history
Change-Id: I666d52e88f8f9217e801ebee0c3273285efcf58d