Merge "adding support to enable different personality of the same soc." into integration