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

Change-Id: I58b1b45ae68d908522afb61b272dba01e82f1009