fix suitable both for hw and virtual nodes

Change-Id: Ib47acbdc7dc8f30e0ffb71e7a1999824892e8702
Merge "fix suitable both for hw and virtual nodes"