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

Change-Id: Iead7e364394e05df41840513084ff7dfa3d30d2d