Merge "Add instantiation state check"
authoryunlong ying <ying.yunlong@zte.com.cn>
Thu, 9 Feb 2017 12:47:14 +0000 (12:47 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 9 Feb 2017 12:47:14 +0000 (12:47 +0000)

Trivial merge