Merge "[PORTAL] Use common aaf template in portal-sdk"