Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f94b944f80  -s ours am: 56cfda2ed4  -s ours
am: b8953810e8  -s ours

Change-Id: I4da36c04729ebc2bdb3f9d18f473537adbd4828f