Merge cherrypicks of [4714135, 4714136, 4714137, 4714216, 4714295, 4714354, 4714355, 4714296, 4714297, 4714298, 4714299, 4714300, 4714301, 4714302, 4714374, 4714375, 4714356, 4714394, 4714395, 4714396] into pi-dr1-release

Change-Id: I957cedbea2d960fcfef0801adc39fa9a9f30536e