timob-14793: change fastdev availability to emulator only
timob-14793: clean up code
Merge pull request #4624 from hieupham007/timob-14793-3_1_X

Timob 14793 3 1 x