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