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

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