Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 23e0aacf9f  -s ours
am: 2ada5e5183  -s ours

Change-Id: I7a02e761a346757f0cf9facd41c0b03743f3acf5