change #3 v0.0.1_ClientDev_A,B,C Branch
Revert "change #3 v0.0.1_ClientDev_A,B,C Branch"

This reverts commit 3ee0ac20e3fac26b47b33d5830994488bbd1ebb5.