Fixed bug 902058 (review comments fixed)

Change-Id: If3f0a38dd704dfb3bacb4f29ddc9782c6897b1e9
2 files changed