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

Change-Id: I785676decb2fc7ddfa9034fbafdfc2deb2f07604