Merge cherrypicks of [4913949, 4913979] into pi-qpr1-release

Change-Id: Ida0d6a734faa333574d13d4319bf149ad9bfa1d7