Merge commit '816ba073c618e4f1c2085451d117d463e71680a0' * commit '816ba073c618e4f1c2085451d117d463e71680a0': ADT #1825491: Provide default choices for <uses-library>
Merge commit '816ba073c618e4f1c2085451d117d463e71680a0' * commit '816ba073c618e4f1c2085451d117d463e71680a0': ADT #1825491: Provide default choices for <uses-library>