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