Change-Id: I7675edf85004272d63d0129c3a29034e6015ad16
* UX fixes * More localization Change-Id: I9f0345cbd4b785f4293ab02fe0006df5c7377cd1