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

Change-Id: I7feec81a3f1525055030ee16f34b8e7251e79b9b