use i18n messages; pep8 changes

Change-Id: I9ee37be3c9579030f3a71fca6b503211650032b9
Merge "use i18n messages; pep8 changes"