Merge cherrypicks of [4648918] into pi-release-2

Change-Id: I79b4d6e216cdc31d3941ed9b2388d605c169037c