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