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