Merge "Fix setCapabilities." into pi-dev am: d1d4cc94ba
am: c60a252b87

Change-Id: Ia5bebf8a233775367bbf1b788870528934ecbcfb