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

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