Merge cherrypicks of [5371217, 5371218, 5370861, 5369688, 5370512, 5370513, 5371204, 5371205] into pi-qpr1-release

Change-Id: I7545ac3af7d41b4ee93b08693d6593036f0904ad