Merge changes from topic "linux_glibc" am: 7b3d4da91a am: 348a082469 am: 60a410d606
am: 55f9ae5223

Change-Id: Iad4aeb106234c072495df67ae2ed9f825d1335d7