Merge "Fix NPE in getDisabledCapabilities()"
am: e7fa565891

Change-Id: I89ea3939ac63a15dc6ed43abc58fc39733d5346a