Merge "Allow DO/PO to be installed with certain preconfigured accounts." into nyc-mr1-dev am: bb69f55f17 am: 0ba73b9853
am: 3266e69160

Change-Id: Ifb1660d1671848ffcdfd43d807ce9ec488df8b61