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

* commit '4396661ece98ac100f1e2485058f5ebe30fb0534':