Fix for bug 3434228

Change-Id: I57973faf782b487e7913a096f0ab6012dc1c9415
4 files changed