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

Change-Id: I39962983e4deb149f6169f78c3db76d7d5f8f26e