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