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