am 001c7d12: Merge "Set capabilities sooner." into gingerbread