Attempt to fix bug 35003

Change-Id: Iaedfca6c4dc8a07fec3c834f99c10a96424aca30
Merge "Attempt to fix bug 35003"