Merge "Handle overlaying without node __symbols__"
am: 523ab1c32a

Change-Id: Ib750d5be34b87de62c1f04c7c3b3acbcfcfbe8a0