am 7911c8b9: (-s ours) am 15e549a8: am 4f5e6c63: Skip warnings for some unresolved references. [DO NOT MERGE]

* commit '7911c8b97d1c11de96e5fe3495d5e3cb979d0f9f':
  Skip warnings for some unresolved references. [DO NOT MERGE]