Merge cherrypicks of [3698122, 3698392, 3697644, 3697645] into pi-release

Change-Id: I3e68fd0dedd6b3a5c7bcd003698efbfde24f9310