Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 249c45391e  -s ours
am: f6667fb429  -s ours

Change-Id: Ibcec94c58ead37e3b9755d91c9eb95c6066d93c1