[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: 78cb42e359 -s ours am: 32096e2c48 -s ours
am skip reason: Change-Id Ia504dd1185de1d33a21fec344871d4b0fabae953 with SHA-1 aa4f582931 is in history
Change-Id: Iff69e121a13a1fcdfc52be6daa468fceff285a4f
This commit is contained in: