am 86ef70eb: Fixing build (Bug 17381033)

* commit '86ef70eb08b83fc41d0c8e124315d9ee9fea0ee4':
  Fixing build (Bug 17381033)