Merge "Address comments at ag/18372083"
tree: 8fcdaabf26feab84c0c28c834b5d0d13bf880ba3
  1. staticlibs/