Merge cherrypicks of [1949776] into ndk-release-r23.

Change-Id: I024247a8a3e399283ec1fba7d7782d0fc82a7762