Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c035f28175  -s ours am: 770e4008b2  -s ours
am: ae6151ecef  -s ours

Change-Id: Ie45ce84c781af3e97cc80df0ff81365eb34470a1