am 756dafc3: resolved conflicts for merge of b376b2cc to jb-mr1-aah-dev

# Via Jean-Baptiste Queru
* commit '756dafc33b350fc8673f6dfe4a10172299d1a42d':
  Generate blob list for tilapia.