Merge cherrypicks of [7478367, 7478616] into pi-qpr3-b-release

Change-Id: I673e31b7c3b0df65a9bcb08b00fbe0d0414482af