am 2bdac140: am 586cc47b: am f4903c25: am 4396661e: am fe025c64: am b61b387c: am 6ea7b782: Merge "TIF: use term \'3rd-party\' instead of \'third-party\'" into lollipop-cts-dev

* commit '2bdac1404f3420761b6b4d90c0d95da9ba43d471':