Closes-bug: #1237841

Change-Id: Ie754219735fc28937c7620f9b0cc6fc364a78af0