Merge cherrypicks of [3666264, 3665805] into pi-release

Change-Id: I1b503da2432964e47481d7b304378d5cc2dad9d7