use i18n messages; pep8 changes, update from core (gerrit: 79582)

Change-Id: Ib5a544ba0b7a123ca2cb4c15a5e0603ebdc9baea
Merge "use i18n messages; pep8 changes, update from core (gerrit: 79582)"