Merge \\\"Import translations. DO NOT MERGE\\\" into stage-aosp-master am: af3c550fa2  -s ours am: ffdd2f2124  -s ours
am: c5529eff0c  -s ours

Change-Id: Ib7bd6263b8902a0c289241e3c66fb3c2dc2087ee