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

* commit 'b61b387c300222ddd20e2a2acdc55d146c76e9ba':
  TIF: use term '3rd-party' instead of 'third-party'