Merge "Don't drop capability"
am: 17b2c31bb8

Change-Id: I4d2e3fd1087108fbd3c1ba5f8a0d408289b8f544