am f06b1224: am 84037f2f: Fix build breakage from syntax errors

* commit 'f06b1224e95e61840d9dfe98790ed16f206e8550':
  Fix build breakage from syntax errors