Merge "Merge cherrypicks of [5929407, 5929627, 5929597, 5929598] into pi-platform-release am: 83cda925e1" into pie-cuttlefish-testing