am 2f9ba88a: am 02093f9a: am fd76e453: am 9bfb6693: am d367c8ee: Merge commit \'7c5c499f\' into manualmerge * commit '2f9ba88a': DO NOT MERGE Add a knownfailure entry for testAvcBaseline12.