[automerger skipped] Merge "Check scopeId size in provideKeyResponse" into...
[automerger skipped] Merge "Check scopeId size in provideKeyResponse" into rvc-dev am: 350456e9 am: 58602217 am: ac9f3f72 am: 9c31e432 -s ours
am skip reason: Change-Id I5d875f98e29c1115c156f7364c9c042426e17d7c with SHA-1 58a1b328 is in history
Change-Id: I97dbf0a912d0a0b0a6255c9979971275f5552afd