[automerger skipped] Merge "Merge lastest test case from master" into rvc-dev am: 09600dd8cc
-s ours
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931
is in history
Change-Id: Ie1a39f1a64db80572937c7454f3975e6684411c6
This commit is contained in: