Merge "DO NOT MERGE: Drop TF master in oc-dev" into oc-dev am: d002352bd6
am: a8aeb871bd

Change-Id: Ib638962fbf693d75f2f111cf2052f5d422704192