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