Merge "Update capability.h"