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 '586cc47b943cfe3917ddc2376a63de5188362ef8':