tree 151e81789e00393b9f98ff7bc25aecc723db3f62
parent a7e57e416667909ee81ab28b6b406364e8d812e4
author jdesprez <jdesprez@google.com> 1496428900 -0700
committer jdesprez <jdesprez@google.com> 1496439900 -0700

DO NOT MERGE: Copy TF master to oc-dev

Drop master in oc-dev to sync them

Test: build tf, pass unit tests
Bug: 37211399
Change-Id: Id4f37b037c54f3532fcc19c42b19f69ec117a608