Merge "Don't WTF when assist structure is missing." into oc-dev am: 9fe48b43ba
am: 0dc16ddee9

Change-Id: I60f2b830c7e93af0d6df148812d7e88309843560