Merge cherrypicks of [1466961] into ndk-release-r22

Change-Id: Ib5b8bbe0ce50b9247dc1bb70a5007699d1de143d