Merge "DO NOT MERGE Fix car libraries for automated SL drop script" into pi-dev