Closes-Bug: #1333076

Change-Id: Id4cb773690248a7ee7ccb710b0fc1474798d72f7