Merge "Using a runtime generated layout for tests instead of defining xml" into udc-dev