sharding/contract: merge with master

Former-commit-id: f11d1a5d916236d9801f1cf53bb79d9814eebcb3 [formerly a0bd58da12e00a0a66cf27d8906d3dbbeb88768f]
Former-commit-id: 5c7f2c0e50def98ec052d7c413f83c3b4fb1ed14
This commit is contained in:
Terence Tsao 2018-05-15 11:25:04 -07:00
commit 591e4e9d49

Diff Content Not Available