[automerger skipped] Merge "Ignore broken test cases" into rvc-dev am:...
[automerger skipped] Merge "Ignore broken test cases" into rvc-dev am: 9e118ed6 am: 7dfc4f48 -s ours am: 3062e390 -s ours
am skip reason: Change-Id I2e2f0664d6e26827513632772e6b77c9f8b089a7 with SHA-1 036f8398 is in history
Change-Id: I1b1d857a83863c88664027ac4c06c091adc2efb6