DO NOT MERGE: Drop TF master in oc-dev

Sync master and oc-dev

Test: build, unit tests
Bug: 37211399
Change-Id: Ie827b7c05475cc7d2cc5deff4faa19b72a2bddca
1 file changed
tree: 7f3963367badbcac2824ca60f71cf46dfd361725
  1. res/