Merge "resolve merge conflicts of c03435f532753b8bd6816d4500ffeb3dcb167a57 to pie-gsi" into pie-gsi