[automerger skipped] Merge changes from topics "AddLibaudiofoundation", "stdContainers" am: 16bcc29edb am: 3c4f15aee1
am: 9b9cb51ccb -s ours
am skip reason: change_id Ic04e637bcc6ba9df84c5e7561ec3c03f18a7d242 with SHA1 06e4bab545 is in history

Change-Id: I17a5584ef0858eba18ab4d3b41ed0a212f1646c1