Fix fatal error in I0349cfe0e322

Change-Id: I4ac41d56c2e0f98cd8f026c7deac1e8ab69e8d54
Merge "Fix fatal error in I0349cfe0e322"