Merge "fix(optee): address late comments and fix bad rc" into integration