Change-Id: I421c5f029e499a2bf212e6de9ed631322624466f
Merge remote-tracking branch 'origin/master'
set watchdir default

Change-Id: I2d61dddd6041f73657b8463e9527e5876a6a9ed3