am d164460e: am 86ef70eb: Fixing build (Bug 17381033)

* commit 'd164460e692762226560af77b6b360ae83335b8f':
  Fixing build (Bug 17381033)