Merge cherrypicks of [5383444, 5383343] into pi-qpr1-release

Change-Id: I13b7b89c11d1ab9b43e46a4f3b759c6c74fcc5ae