Merge cherrypicks of [6333255, 6333230, 6333232, 6333337, 6333338, 6333339, 6333853, 6333199, 6333874, 6333875, 6333876, 6333877, 6333274, 6333275, 6333276, 6333277, 6333814, 6333256, 6333815, 6333278, 6333236, 6333854, 6333816] into pi-b4s4-release

Change-Id: I78ba1c02bf67c0d9c345fe564a267a5a35c7ba44