Fix bug 43375

Change-Id: I75a1e1d9b9a7916c79e4a242896374a11432b82f
Merge "Fix bug 43375"