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

Change-Id: I75f3bcb086e5c6ccb4e41353e03c452c40d202bb