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

Change-Id: Iacd2f15ad31ec7d5c83b21674e1e1f106a5fbd96