Merge "Fix NPE in getDisabledCapabilities()" am: e7fa565891 am: b3202f8b67
am: 6afda93ef5  -s ours

Change-Id: Ifc8d5369a73b59d8fe93ebdf2e324bf0fe6a0515