Merge cherrypicks of [1836035, 1836036, 1836037, 1835944, 1835945, 1836015] into ndk-release-r23

Change-Id: Ib056b0151d26df413ce0d36f12befb7ffd55ded3