[automerger skipped] Merge "Ignore broken test cases" into rvc-dev am:...
[automerger skipped] Merge "Ignore broken test cases" into rvc-dev am: 9e118ed6 am: 75c03741 am: 2c9b7803 am: e8077419 -s ours
am skip reason: Change-Id I2e2f0664d6e26827513632772e6b77c9f8b089a7 with SHA-1 036f8398 is in history
Change-Id: I28a18e0c6dedc27468c1a5c81dd1442f442be1ee