Merge cherrypicks of [4997631, 4995493, 4995514, 4995515, 4995516, 4997651] into pi-qpr1-release

Change-Id: Iad797e9b1e21a9ebf9729c68c52f61b1322fbe65