[automerger skipped] Merge changes from topic "generic_by_name" into pi-dev
am: 34de3c84fe  -s ours

Change-Id: I4bbcfafd21370d14d796fff341d5bf83b91fff95