Attempt to fix bug 70041

Change-Id: Ib997a2bb6ffd10e4b51cc1b7ce5e793b83a0c93d
Merge "Attempt to fix bug 70041"