Merge "Revert "flacky unit test"" into oc-dev
Chen Xu [Wed, 17 May 2017 06:34:57 +0000 (06:34 +0000)]

Trivial merge