Merge "New failures due to linker issue."
am: c753c96360

* commit 'c753c96360dc68e10fe42aa240fdacca49469070':
  New failures due to linker issue.