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

Change-Id: I237334c00621444a27ec462eca86230c19575c87