Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: 80eee73afb  -s ours am: a461b81a54  -s ours
am: 96cf13a10b  -s ours

Change-Id: Ic6ff81c3fb2e680ceaa84d1d6d85c8947fe0cf48