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

Change-Id: I3639f75eb19a4d641889eddf6bb428597c877a6c