am e7691daf: am 89f19371: am 6ab47fc1: Merge "Allow device initializers to set a preferred setup activity." into mnc-dev

* commit 'e7691dafecf60906d3d6660c532917466e5c25d1':
  Allow device initializers to set a preferred setup activity.