Merge cherrypicks of [947592, 947593] into pie-cts-release

Change-Id: I351aa27122b2bb838953a732e949b72f93a2308f