Merge "[COMMON] Use common aaf template in elasticsearch"