Merge "Improve container capability bounding in containers" am: 586fd52b34 am: ed05287c55 am: 755baf92b4 am: 64f1d42e6c
am: 22f95dbdc0

Change-Id: I673549399e3cae4501cac77c510dbc30a5ed8163