Merge cherrypicks of [4189833, 4186953, 4190512, 4190513] into pi-release

Change-Id: Ibf22ddc21efdfafd5256fb8c70d228e8a822724f