Merge "Avoid NPE when missing underlyingCaps." am: 6522970c1e am: e35adbc4d2
am: 552ab5f4b0

Change-Id: Ifc8edb9643ee601e285557cb3c320e541a5d0f78