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

Change-Id: Ic92fcce844f8162b5cc1bb24fbf2595d4008b7bb