Merge "Improve container capability bounding in containers" am: 586fd52b34
am: ed05287c55

Change-Id: I4e35ece840f6094f869bdc9a8d881ec985a1c25b