Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f99e090a59  -s ours
am: 6c15e41132  -s ours

Change-Id: I4ccdda15676463fc597708615c9050bc55d365e3