Merge "Add hasUnwantedCapability method" into pi-dev am: c5138d2697
am: 88c39a1810

Change-Id: Id5ca5b8665601cb8dab66a41ccbfa3c1f1b99e52