Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 76116a45b7  -s ours am: 593bf07724  -s ours
am: 159713016c  -s ours

Change-Id: I9c25cf536c95247d1c58f2eaa9bb67fd62f94e69