Merge cherrypicks of [3891315, 3891335, 3891336] into pi-release

Change-Id: I5f015993e55ab8ea1fe69c829790cc92947ecd3e