jira:[fixed device issue ] Change-Id: Ibab8db09854adca1e80acaf3831c6e4191e137c7 (cherry picked from commit 0572d811780ac406214665af7748e4ba8243bdc8) (cherry picked from commit b60cdcfed85b1dc89c23ee21cb613e5be86eb14d)
jira:[fixed device issue ] Change-Id: Ibab8db09854adca1e80acaf3831c6e4191e137c7 (cherry picked from commit 0572d811780ac406214665af7748e4ba8243bdc8) (cherry picked from commit b60cdcfed85b1dc89c23ee21cb613e5be86eb14d)