Check in for bp/capability-type-persistence.

Change-Id: Iabf2a5b9bf27b76ab04e0c49a0a928202c483f2f