This is pretty much automatic refactoring. Thanks Eclipse! Change-Id: I8ccd24d11878445c836347e9c487c91461eee9cd