Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: fdd8c4bbee  -s ours
am: 3b5113a48d  -s ours

Change-Id: I35e875428f30d65354af60228d90a8d4ad5af790