Merge "Add vogar expectation file support for CTS." into gingerbread