tree 7f3963367badbcac2824ca60f71cf46dfd361725
parent 009c6659bbe85a04bfe0d335c74c29a72cb74ebe
author jdesprez <jdesprez@google.com> 1496428958 -0700
committer jdesprez <jdesprez@google.com> 1496439932 -0700

DO NOT MERGE: Drop TF master in oc-dev

Sync master and oc-dev

Test: build, unit tests
Bug: 37211399
Change-Id: Ie827b7c05475cc7d2cc5deff4faa19b72a2bddca