Merge "Use WriteToTensorAsVector instead of WriteToTensor" am: 87db7aab32
am: 6ce16c28e5

Change-Id: I087fc1d7ca695c90ba73843c4300c7bde35e2013