ref: 65f4299d6546e8f9a527569b75ba6127a2b40b64
parent: b3a262dff3a3083cf6232a68b7c18be92b4cc7c0
parent: c12d1d9b982e8717d2d7cabe3230105948bd3b7a
author: Johann Koenig <johannkoenig@google.com>
date: Fri Jun 9 16:41:56 EDT 2017
Merge "Remove some dead code. Coverity CID 1310058"