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