Merge commit 'd400b58b60028b66eee1ae751fc4983a07946275' of sso://googleplex-android/platform/bionic into HEAD
Change-Id: I7e6dcce2838a41eb9b00da869a5f4d076ab23a72