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

Change-Id: Idf69d1f9c73cadc3f218912669abfc73a280d49f