Merge "Not create document under the device." into nyc-mr2-dev