Fixes bug 850389 (cherry picked from commit 6574d1bb17) Change-Id: I10101c0edb70c70db7a3b27ee4b8cc8f2f62a503
6574d1bb17