[automerger skipped] Merge "Fix test initialization errors on Q" into rvc-dev am: 203e783ccd -s ours
am skip reason: Change-Id I262b54c6897ed755adaeb2b118c638320634f7a1 with SHA-1 a7f8f2d01c is in history
Change-Id: I13a5e49edd39e64b9202333932eae307c3e19ede
This commit is contained in: