Merge "[COMMON] Override truststore in aaf_agent image"