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

Change-Id: I07eb375c2b86651fd7d65f944b19161d2c977df4