Merge "Fix Fatal Exception in UserCapabilityExchangeImpl" am: 7bea480462

Change-Id: I0b975ef81c859775348ee7434a1e568587692b18