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

Change-Id: I878cc36ffe38e784e0819be9760a0317f33b006a