Merge "Import translations. DO NOT MERGE am: ac7ee28cd0 -s ours am: 052dce27c9 -s ours" into nyc-mr1-dev-plus-aosp
am: de32354f40 -s ours
Change-Id: Id1cb22cfa225d976c56c5b7279594cdc481dfd12
This commit is contained in: