Merge "[automerger skipped] Merge "Forbid granting access to NLSes with...

Merge "[automerger skipped] Merge "Forbid granting access to NLSes with too-long component names" into rvc-dev am: 7e6c75cc am: af247aef -s ours am: dcd80daf -s ours am: 59eb028c -s ours am: cbed626a -s ours am: cf968341 -s ours am: d9211df8 -s ours am: 50ba4b02 -s ours am: b91edcc6 -s ours am: f0ffe556 -s ours"