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

Change-Id: I42c756fa6a969bae7570dfbdf2378c8ac9ea23db