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

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