fix Bug #1378946

Change-Id: I2bbe93b4093261b566fab9c10b94fb8e82483bc9
Merge "fix Bug #1378946"