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