Merge "Update translation strings." am: 7c72ef1a64
am: 29a8ebdf5d

Change-Id: Ie4c76ba03f652ddd9eb2922088ae6f7e6003ff37