Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 86b1443231  -s ours
am: 6c51cef57a  -s ours

Change-Id: I612ff4a199f8f22ac7d19af5592bad9c764cd2c1