Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: dc92c70106  -s ours
am: fb8a4d17c2  -s ours

Change-Id: Iad52ae446ff8eb6a628ef29a7bd2013e7f060994