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