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