Merge "Not create document under the device." into nyc-mr2-dev
am: 4b2542315f

Change-Id: Ifb0f7a8814fec42d6919f8aebaccc1c06a315dd0