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

Change-Id: Ibbd645fa42b8e6d4f4ae05260839ac87a2430519