commit 934741fd is lost as keystone servier's bug, so resubmit this commit bug:138270036 Change-Id: I6e7fa9fc0a153b7b3dd8f922ed7283139502a27b CRs-Fixed: 2372384