fixed bug 43624 with solution by Brian McCloskey

Change-Id: I1b5dfcd1a21857afb2a7d5ccf025cd98fa4daf7a
cherry-pick deb260ee06b908772d31503f65e84d737117d090

Change-Id: I16d9f6c0992973388ee1890f1a23c3415b4010bf