Merge cherrypicks of [3094267, 3095329, 3095257, 3095367] into pi-release

Change-Id: I5bfbf0e26a0e9229f26c34da8960a2ad5b0a3829