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

Change-Id: Id19a54e066b157c379506cef3b6725d66a059c79