Merge cherrypicks of [4703954, 4703955, 4703956, 4703974, 4702197, 4701815, 4701816, 4703428, 4703957, 4703429, 4701817, 4701818, 4701819, 4701820, 4701821, 4701822, 4701823, 4703431, 4703432, 4704034, 4704035, 4701660] into pi-dr1-release

Change-Id: I253cf3470e0aaea6787b961c1c6f16d2ca52fb6c