Merge changes from topics "AddLibaudiofoundation", "stdContainers" am: 16bcc29edb
am: 3c4f15aee1

Change-Id: I4866d667d664f75e55f39cb38311fb1100ad8e70